new function

2001-06-05  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktoolbar.c (gtk_toolbar_remove_space): new function

diff --git a/ChangeLog b/ChangeLog
index f67f2a891887746425c7b407e49a59d2f3d65b67..252ae0b1e780266130b55f09523028ce9e4fa0be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-05  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_remove_space): new function
+
 2001-06-05  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkspinbutton.c (gtk_spin_button_set_range): clamp the value 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f67f2a891887746425c7b407e49a59d2f3d65b67..252ae0b1e780266130b55f09523028ce9e4fa0be 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+2001-06-05  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_remove_space): new function
+
 2001-06-05  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkspinbutton.c (gtk_spin_button_set_range): clamp the value 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f67f2a891887746425c7b407e49a59d2f3d65b67..252ae0b1e780266130b55f09523028ce9e4fa0be 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2001-06-05  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_remove_space): new function
+
 2001-06-05  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkspinbutton.c (gtk_spin_button_set_range): clamp the value 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f67f2a891887746425c7b407e49a59d2f3d65b67..252ae0b1e780266130b55f09523028ce9e4fa0be 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+2001-06-05  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_remove_space): new function
+
 2001-06-05  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkspinbutton.c (gtk_spin_button_set_range): clamp the value 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f67f2a891887746425c7b407e49a59d2f3d65b67..252ae0b1e780266130b55f09523028ce9e4fa0be 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2001-06-05  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_remove_space): new function
+
 2001-06-05  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkspinbutton.c (gtk_spin_button_set_range): clamp the value 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f67f2a891887746425c7b407e49a59d2f3d65b67..252ae0b1e780266130b55f09523028ce9e4fa0be 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2001-06-05  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_remove_space): new function
+
 2001-06-05  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkspinbutton.c (gtk_spin_button_set_range): clamp the value 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f67f2a891887746425c7b407e49a59d2f3d65b67..252ae0b1e780266130b55f09523028ce9e4fa0be 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2001-06-05  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_remove_space): new function
+
 2001-06-05  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkspinbutton.c (gtk_spin_button_set_range): clamp the value 

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 1008c0f0c0663cf4ea9526a80928569276ba7f23..93dbadc394352deead127d187a1ed41e6cb5b24d 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -1159,6 +1159,46 @@ gtk_toolbar_insert_space (GtkToolbar *toolbar,
                              position);
 }
 
+void
+gtk_toolbar_remove_space (GtkToolbar *toolbar,
+                          gint        position)
+{
+  GList *children;
+  GtkToolbarChild *child;
+  gint i;
+  
+  g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
+  
+  i = 0;
+  for (children = toolbar->children; children; children = children->next)
+    {
+      child = children->data;
+
+      if (i == position)
+        {
+          if (child->type == GTK_TOOLBAR_CHILD_SPACE)
+            {
+              toolbar->children = g_list_remove_link (toolbar->children, children);
+              g_free (child);
+              g_list_free (children);
+              toolbar->num_children--;
+              
+              gtk_widget_queue_resize (GTK_WIDGET (toolbar));
+            }
+          else
+            {
+              g_warning ("Toolbar position %d is not a space", position);
+            }
+
+          return;
+        }
+
+      ++i;
+    }
+
+  g_warning ("Toolbar position %d doesn't exist", position);
+}
+
 void
 gtk_toolbar_append_widget (GtkToolbar  *toolbar,
                           GtkWidget   *widget,

diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h
index 79d3d79dbceaf7d2db7e67871d4f7fd0da9050d8..62934110de23704bdb033c919efdb228e0b36dcc 100644 (file)
--- a/gtk/gtktoolbar.h
+++ b/gtk/gtktoolbar.h
@@ -153,6 +153,8 @@ void       gtk_toolbar_append_space    (GtkToolbar      *toolbar);
 void       gtk_toolbar_prepend_space   (GtkToolbar      *toolbar);
 void       gtk_toolbar_insert_space    (GtkToolbar      *toolbar,
                                        gint             position);
+void       gtk_toolbar_remove_space    (GtkToolbar      *toolbar,
+                                        gint             position);
 
 /* Any element type */
 GtkWidget* gtk_toolbar_append_element  (GtkToolbar      *toolbar,